Skip to content

Fix incompatible Package.resolved pins and add CI guard#770

Merged
theospears merged 4 commits intomasterfrom
revert-swift-syntax-bump
Apr 26, 2026
Merged

Fix incompatible Package.resolved pins and add CI guard#770
theospears merged 4 commits intomasterfrom
revert-swift-syntax-bump

Conversation

@theospears
Copy link
Copy Markdown
Collaborator

@theospears theospears commented Apr 26, 2026

Summary

  • Revert swift-syntax from 603.0.1 to 602.0.0 — CoreDataEvolution constrains it to <603.0.0, so 603.x was never valid
  • Bump keychain-swift project constraint from upToNextMajorVersion: 20.0.0 (allows 20.x only) to 24.0.0 to match the Dependabot pin
  • Add CI check that fails if Package.resolved is modified during build, catching future incompatible Dependabot bumps

Both issues caused Xcode to silently re-resolve to different package versions on every build, producing spurious local diffs.

Test plan

  • Open project in Xcode — verify no Package.resolved changes on resolve
  • Build succeeds
  • CI check passes (Package.resolved unchanged after build)

🤖 Generated with Claude Code

@theospears theospears requested a review from a team as a code owner April 26, 2026 04:35
theospears and others added 2 commits April 25, 2026 21:43
Detects when checked-in Package.resolved contains versions that
are incompatible with dependency constraints, which causes Xcode
to silently re-resolve to different versions during build.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The Dependabot PR #754 bumped the pin in Package.resolved to 24.0.0
but the project constraint was still upToNextMajorVersion: 20.0.0
(which only allows 20.0.0..<21.0.0), causing Xcode to re-resolve
back to 20.0.0.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@theospears theospears changed the title Revert swift-syntax bumps to fix CoreDataEvolution compatibility Fix incompatible Package.resolved pins and add CI guard Apr 26, 2026
@theospears theospears merged commit db77f9c into master Apr 26, 2026
6 checks passed
@theospears theospears deleted the revert-swift-syntax-bump branch April 26, 2026 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant